(shortcuts_add_current_folder): Don't leak volume. (#155400,

	Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 96320ebd858650be61ae9e50b132e0d3c9cf351c..c763a4fd4d722487cb6bb026017ac70723a28e85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
        get text unnecessarily.  (#155384, Morten Welinder)
        (gtk_file_chooser_default_finalize): Don't forget to
        unref the tooltips.  (#155412, Morten Welinder)
+       (shortcuts_add_current_folder): Don't leak volume. (#155400,
+       Morten Welinder)
 
 2004-10-12  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 96320ebd858650be61ae9e50b132e0d3c9cf351c..c763a4fd4d722487cb6bb026017ac70723a28e85 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -4,6 +4,8 @@
        get text unnecessarily.  (#155384, Morten Welinder)
        (gtk_file_chooser_default_finalize): Don't forget to
        unref the tooltips.  (#155412, Morten Welinder)
+       (shortcuts_add_current_folder): Don't leak volume. (#155400,
+       Morten Welinder)
 
 2004-10-12  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 96320ebd858650be61ae9e50b132e0d3c9cf351c..c763a4fd4d722487cb6bb026017ac70723a28e85 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -4,6 +4,8 @@
        get text unnecessarily.  (#155384, Morten Welinder)
        (gtk_file_chooser_default_finalize): Don't forget to
        unref the tooltips.  (#155412, Morten Welinder)
+       (shortcuts_add_current_folder): Don't leak volume. (#155400,
+       Morten Welinder)
 
 2004-10-12  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 96320ebd858650be61ae9e50b132e0d3c9cf351c..c763a4fd4d722487cb6bb026017ac70723a28e85 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -4,6 +4,8 @@
        get text unnecessarily.  (#155384, Morten Welinder)
        (gtk_file_chooser_default_finalize): Don't forget to
        unref the tooltips.  (#155412, Morten Welinder)
+       (shortcuts_add_current_folder): Don't leak volume. (#155400,
+       Morten Welinder)
 
 2004-10-12  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 91113f8d1c28e547c6137fcb19cf2f697153143a..8a4d53bc38b43469af43dcf681fac371ae335490 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1441,12 +1441,15 @@ shortcuts_add_current_folder (GtkFileChooserDefault *impl)
          strcmp (gtk_file_path_get_string (base_path), gtk_file_path_get_string (impl->current_folder)) == 0)
        {
          success = shortcuts_insert_path (impl, pos, TRUE, volume, NULL, NULL, FALSE, NULL);
-         if (!success)
-           gtk_file_system_volume_free (impl->file_system, volume);
+         if (success)
+           volume = NULL;
        }
       else
        success = shortcuts_insert_path (impl, pos, FALSE, NULL, impl->current_folder, NULL, FALSE, NULL);
 
+      if (volume)
+       gtk_file_system_volume_free (impl->file_system, volume);
+
       if (base_path)
        gtk_file_path_free (base_path);